From: Timo Röhling <roehling@debian.org>
Date: Sun, 6 Feb 2022 21:57:56 +0000 (+0100)
Subject: Use system spirv-cross
X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~72
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=8c8ce70cf126b40341fe7987923520da53503673;p=filament.git

Use system spirv-cross
---

diff --git a/debian/cmake/spirv-cross.cmake b/debian/cmake/spirv-cross.cmake
index 62a36ec..d95075c 100644
--- a/debian/cmake/spirv-cross.cmake
+++ b/debian/cmake/spirv-cross.cmake
@@ -1,7 +1,10 @@
 find_package(spirv_cross_c_shared REQUIRED)
+find_package(spirv_cross_core REQUIRED)
+find_package(spirv_cross_glsl REQUIRED)
+find_package(spirv_cross_msl REQUIRED)
 find_package(spirv_cross_cpp REQUIRED)
 if(NOT TARGET spirv-cross)
     add_library(spirv-cross INTERFACE)
-    target_link_libraries(spirv-cross INTERFACE spirv-cross-cpp spirv-cross-c-shared)
+    target_link_libraries(spirv-cross INTERFACE spirv-cross-cpp spirv-cross-msl spirv-cross-glsl spirv-cross-c-shared)
 endif()
 
diff --git a/debian/control b/debian/control
index e202d12..15d097f 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends: debhelper-compat (= 13),
     libsdl2-dev,
     libstb-dev,
     libtinyexr-dev,
+    libspirv-cross-c-shared-dev (>= 2021.01.15-5~),
     robin-map-dev,
     spirv-tools,
     zlib1g-dev,
diff --git a/debian/patches/0012-Use-system-spirv-cross.patch b/debian/patches/0012-Use-system-spirv-cross.patch
new file mode 100644
index 0000000..d449c51
--- /dev/null
+++ b/debian/patches/0012-Use-system-spirv-cross.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
+Date: Thu, 27 Jan 2022 19:50:26 +0100
+Subject: Use system spirv-cross
+
+---
+ CMakeLists.txt              | 2 +-
+ libs/filamat/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c117c3..632ece6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -624,7 +624,7 @@ add_subdirectory(${EXTERNAL}/getopt)
+ if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM)
+     include(debian/cmake/spirv-tools.cmake)
+     include(debian/cmake/glslang.cmake)
+-    add_subdirectory(${EXTERNAL}/spirv-cross/tnt)
++    include(debian/cmake/spirv-cross.cmake)
+     add_subdirectory(${LIBRARIES}/filamat)
+ 
+     # the material debugger requires filamat
+diff --git a/libs/filamat/CMakeLists.txt b/libs/filamat/CMakeLists.txt
+index a130f0c..9b38857 100644
+--- a/libs/filamat/CMakeLists.txt
++++ b/libs/filamat/CMakeLists.txt
+@@ -122,7 +122,7 @@ if (APPLE OR MSVC)
+     target_link_libraries(${TARGET} glslang SPIRV SPVRemapper SPIRV-Tools-opt spirv-cross-glsl)
+ else()
+     target_link_libraries(${TARGET} PRIVATE
+-            -Wl,--start-group glslang SPIRV SPVRemapper SPIRV-Tools-opt spirv-cross-glsl -Wl,--end-group)
++            -Wl,--start-group glslang SPIRV SPVRemapper SPIRV-Tools-opt spirv-cross -Wl,--end-group)
+ endif()
+ 
+ # ==================================================================================================
diff --git a/debian/patches/series b/debian/patches/series
index 39f56b0..e18104f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-Fix-library-export-for-Debian.patch
 0010-Rename-resgen-executable-to-avoid-conflict-with-mono.patch
 0011-Replace-BlueGL-with-GLEW.patch
+0012-Use-system-spirv-cross.patch